Bump version to 1.5next
Merge branch 'master' into develop