Merge branch 'pdf'