Merge branch 'master' into dev after v1.5 merge.