Merge pull request #5338 from danmcp/master

Merged by openshift-bot