Merge branch 'master' into macbook-branch