Merge pull request #4676 from danmcp/master

Merged by openshift-bot
Bug 1061098