BZ904081
Merge pull request #1215 from bdecoste/master

Merged by openshift-bot