Bug 962354
Merge pull request #2445 from danmcp/master

Merged by openshift-bot