Merge remote-tracking branch 'origin/master'
Updated Changelog and version.