makePDF fix for OSX Yosemite
Merge remote-tracking branch 'upstream/master'