Release 1.3.0
Merge branch 'master' into geezer

Conflicts:
	package.json
Update version to 1.4.0-pre

[ci skip]
Merge branch 'master' into geezer

Conflicts:
	package.json