Changelog and API docs corrected.
Updated remaining license notes from LICENSE.html to md.
Merge branch 'master' into major