Merge branch 'release/yosemite'
Merge tag 'yosemite' into develop

Updated for Yosemite