more for 'changing fix for pdf'
Merge branch 'matt_dev' into dev