cleanup
Merge pull request #3492 from danmcp/master

Merged by openshift-bot