Fixes for LyX on OSX 10.10 (Yosemite). From Stephan Witt.
Merge remote-tracking branch 'github/build-bot-2.1.x' into bleeding-edge-2.1.x
2014.10.27-16.00