Develop cherry pick

Cherry pick missing changes from the subversion release branch.

Please don't rebase this, it's branched from a point to make it ultimately identical to https://github.com/boostorg/mpl/pull/3.