Relicensed as Apache 2.0.
Merge branch 'apache-license' into develop
Fixes #224.