shape-image-019
Merge remote-tracking branch 'upstream/master' into hansmuller/shape-image-019

shape-image-019
Merge pull request #532 from HansMuller/hansmuller/shape-image-019

Hansmuller/shape image 019