Merge branch 'master' into import-wcf