Release 1.5.0
Merge branch 'master' into geezer

Conflicts:
	package.json
Update version to 1.6.0-pre

[ci skip]
Merge branch 'master' into geezer

Conflicts:
	package.json

[ci skip]