Merge pull request #3330 from danmcp/master

Merged by openshift-bot