Require minimum Mac OS X 10.7
Merge remote-tracking branch 'origin/master' into unstable