Merge pull request #815 from ds22x/master

Make "Additional Cropping" option compatible with hardware renderers
21 jobs for master in 38 minutes and 17 seconds (queued for 108 minutes)