Merge 'unstable' into master for 1.5