Merge pull request #4809 from danmcp/master

Merged by openshift-bot