Revert "Revert "Merge branch 'QRprint' into devel""

This reverts commit 7da00ac59fd62ce0240698d12cb2ff77f20f4321.