This backports commit 8e72fad3c to the RC_1_1 branch, taking into account that C++98 is allowed for RC_1_1 with older boost versions.