Reapplied patch from version 1.28, overwritten by previous commit.
Reapplied patch from version 1.28, overwritten by previous commit.

tiborsimko/invenio,tiborsimko/invenio,inveniosoftware/invenio,inveniosoftware/invenio