promote changes from dev for 1.5 - see CHANGELOG