Merge pull request #5179 from danmcp/master

Merged by openshift-bot