Merge branch 'Macpro'
Merge branch 'master' of https://github.com/shockingpants/GIT