Update to latest 1.4.2
Merge branch 'master' into stable-1.4