Bug 962627
Merge pull request #2517 from danmcp/master

Merged by openshift-bot