Update to version 1.5.0-pre
Merge branch 'master' into geezer