OS X install updates
Merge branch 'master' of github.com:qgis/Quantum-GIS