Bug 963617
Merge pull request #2508 from danmcp/master

Merged by openshift-bot