Merging from trunk

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