Merge.
Branching unordered to create a version to use with boost 1.35