Bug 962662
Merge pull request #2587 from danmcp/master

Merged by openshift-bot