new method will be used in PDF plugin
a rollback: existing method is good enough
synchronization with beta branch
Merge branch 'master' into ice-cream-sandwich