Bug 973718
Merge pull request #2841 from lnader/master

Merged by openshift-bot