Merge branch 'master' into cmake
Remove reference to boost submodule
Merge remote-tracking branch 'upstream/cmake' into lb-refactor