Merge pull request #4883 from danmcp/master

Merged by openshift-bot