Bug 1028393
Merge pull request #4187 from lnader/master

Merged by openshift-bot