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

shape-image-020
made the title conform to the template
Merge pull request #533 from HansMuller/hansmuller/shape-image-020

Hansmuller/shape image 020