Merging from trunk

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