Merge branch 'master' into Mac

Latest master changes