Merging from trunk

svn path=/branches/release/libs/xpressive/; revision=84745