Merge branch 'master' into release
Bump version to 1.4.0
Merge branch 'release'