2100 imagefield crop

No changes other than two patches already submitted to d.o