Merging the cropping feature from 1.0.5-ftw1 into 1.0.9.