Merge pull request #4808 from danmcp/master

Merged by openshift-bot