Merge pull request #5186 from danmcp/master

Merged by openshift-bot