formatter: master merge fix
formatter: master merge fix

* Reapplies 71fe41cacf6bdb124433aca1a40acafdeaf361af which got
  overwritten by the large master to next merge.

Signed-off-by: Lars Holm Nielsen <7eaffca9f7cd98839b5821d0d23e09ff764b82cd@cern.ch>

tiborsimko/invenio-formatter,tiborsimko/invenio-formatter,tiborsimko/invenio-formatter,inveniosoftware/invenio-formatter,inveniosoftware/invenio-formatter,inveniosoftware/invenio-formatter