Fix for OS X 10.10
merged and fixed