Merge branch 'hotfix/0.6.2'
Add print scaling and crop box options to PDF rendering.
Merge branch 'hotfix/0.6.3' into develop

Conflicts:
	include/page_frame_decorator.cls.php