Resubmit a pull request for camlimages.4.1.1

Sorry, let me resubmit the pull request. The last one contains too many accumulated diffs and caused me a lot of trouble of rebase conflicts.