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