Bug 964337
Merge pull request #2597 from lnader/master

Merged by openshift-bot