Merge branch 'privacy'
Added PDF option