shape-image022
Merge remote-tracking branch 'upstream/master' into shape-image-022

shape-image-022
fixed a metadata copy and pasteO
spanning fixes and webkit prefix removal per review feedback
Merge pull request #537 from HansMuller/hansmuller/shape-image-022

Hansmuller/shape image 022