bug 1054654
Merge pull request #4608 from lnader/master

Merged by openshift-bot