Bug 977929
Merge pull request #4251 from lnader/master

Merged by openshift-bot