Merge pull request #1866 from asturur/fix-in-image-resize

fix image resize method
Merge branch 'master' into Textbox

To keep internal changes up to date in Textbox branch
Dis updated