Merge "Bug fixes in the print dialog" into klp-dev