merge [83308] and [83392] from trunk, fixes #6926

svn path=/branches/release/boost/accumulators/; revision=83633