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

shape-image-021
fixed image filename in reference file
closed span per review feedback
closed the other span (oops)
Merge pull request #536 from HansMuller/hansmuller/shape-image-021

Hansmuller/shape image 021