Merge "rotate images before saving" into gb-ub-photos-arches