Merge branch 'master' into selfupdate-git