Merge develop into master following minor CHANGELOG edits.