merge master into macbook-branch