Merge pull request #4918 from danmcp/master

Merged by openshift-bot