SWC-1056
Merge pull request #707 from jay-hodgson/SWC-1056

SWC-1056: add support to scale images that have any aspect ratio