And merge r1365556 to this branch to remove the XFail marker
And merge r1365556 to this branch to remove the XFail marker

git-svn-id: 9e952eb18f3107167ad1e133e76411f5f09cb57e@1365560 13f79535-47bb-0310-9956-ffa450edef68

wbond/subversion,wbond/subversion,wbond/subversion,wbond/subversion,wbond/subversion,wbond/subversion,wbond/subversion