Merge pull request #9 from boostorg/master

Remerge to/from develop/master to fix histories.