Image: state that my changes are MIT X11 licensed
Merge branch 'image-fixes3' into image-fixes2