Merge branch 'master' into bc-namespaced