Merge pull request #5311 from danmcp/master

Merged by openshift-bot