Bug 994419
Merge pull request #3418 from lnader/master

Merged by openshift-bot