956570
Merge pull request #2238 from danmcp/master

Merged by openshift-bot