Merging from trunk

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