Touch-up work on crops
Merge remote-tracking branch 'origin/advancedcrops' into advancedcrops