Merge branch 'master' into issue750settings