Update oa_wiki for manualcrop
Update trash_flag
Merge remote-tracking branch 'origin/7.x-2.x' into 7.x-2.x