fix #641 resize doesn't update image dimensions
Merge branch '2.x' into 2.1
Merge branch '2.1' into 2.1_n