Mac OSX deployment target 10.7
Merge branch 'master' into builds
7.329