Fixes #55. Cherry pick change for tripleo-image-elements
Merge pull request #63 from gfidente/master

Fixes #55. Cherry pick change for tripleo-image-elements