Merge pull request #2063 from danmcp/master

Merged by openshift-bot
cleanup