Fixed for Mac OS X Yosemite
Merge remote-tracking branch 'origin/master'