Merge remote-tracking branch 'remotes/pelle/patch/img_size'