Merge branch 'master' into 0.4-development
Merge branch 'master' into 0.4-development
Revert "Merge branch 'master' into copy-strip-sign"

This reverts commit b7266e92bb1dfe422e5cff0fccc1b18cba5e576f, reversing
changes made to 90868ef6ae7a33088ad7a8ca4b85aeb83ba54ba1.
Merge branch '0.4-development' into copy-strip-sign