Fix loading of fonts that are not referenced by an object identifier
Small cleanup in 'set page'
Merge pull request #3997 from Snuffleupagus/bug-946506

Fix loading of fonts that are not referenced by an object identifier
Merge pull request #4043 from Snuffleupagus/set-page-cleanup

Small cleanup in 'set page'