v1.4.1

Merge in v1.4.1 changes
Merge branch 'master' into development