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