Upgrade the Boost version
Merge branch 'boost-upgrade'
Merge branch 'master' into kvlist