Merge branch 'master' into setupfix-john