Licensed code under boost software license
Merge branch 'master' into threaded_collisions