Merge pull request #1182 from danmcp/master

Merged by openshift-bot
Bug 902117