Speeding up merges
Merge pull request #4607 from danmcp/master

Merged by openshift-bot