Merge pull request #2647 from shogun-toolbox/fix-osx-10.10

fixes for Mac OSX 10.10 (#2635)