Relicenced to Boost Software Licence.
Merge branch 'master' into dev