Bug 958653
Merge pull request #2469 from lnader/master

Merged by openshift-bot