Bug 962673
Merge pull request #2570 from danmcp/master

Merged by openshift-bot