Merge pull request #5113 from danmcp/master

Merged by openshift-bot