Bug 1034555
Merge pull request #4317 from lnader/master

Merged by openshift-bot