Merge pull request #4855 from danmcp/master

Merged by openshift-bot