Improve scaling of stamp for annotation

Sune Vuorelarequested to merge
work/sune/better-image-scaling-for-stamps into master

Merge request reports