Fix minor resize issue where the loop doesn't fix values until the threshold is behind us - refs BT#7424
Merge remote-tracking branch 'origin/master'