Allow 0 to reset size of cursor before going to origin
Merge master