brings master up to v1.4.2 commit 885fe5d