Correct cropper bug
Merge origin/master