makePDF fix for OSX Yosemite
Merge branch 'master' into my_master