Promote 1.5 changes from dev; see CHANGELOG
Merge remote-tracking branch 'origin/master'
Promote 1.5 changes from dev; see CHANGELOG