Merge pull request #1223 from danmcp/master

Merged by openshift-bot
Bug 902286