Cleanup
Merge pull request #4994 from danmcp/master

Merged by openshift-bot