Fixed bug resulting from #433
Merge branch 'develop'
Updated release notes.