Merge pull request #5315 from danmcp/master

Merged by openshift-bot