Bug 962805
Merge pull request #2462 from danmcp/master

Merged by openshift-bot