cleanup
Merge pull request #3300 from danmcp/master

Merged by openshift-bot