Revert "Revert "Merge branch 'master' into deploy""

This reverts commit 4ffa90353578721255ebd66a86b575e81bc76fe2.