Merge branch 'release/1.4.1'
Merge pull request #2232 from ether/master

Merge branch 'release/1.4.1'