image_pipeline 1.11.4
Merge pull request #2610 from vrabaud/master

image_pipeline 1.11.4