Merge pull request #9 from boostorg/master

Remerge to/from develop/master to fix histories.
Merge pull request #10 from boostorg/develop

Merge pull request #9 from boostorg/master