merge master to jarodwen/hotfix/postbeta