Support Yosemite
v9.2 2014-08-18
Merge branch 'feature/yosemite' into develop