1.5.0 release
Merge branch 'develop'