Bug 1054406
Merge pull request #4506 from lnader/master

Merged by openshift-bot