OS X 10.7+ is a requirement
Merge branch 'develop'