Bug 962657
Merge pull request #2659 from danmcp/master

Merged by openshift-bot