import fixes from objavi2.1 branch for non-ascii tables of contents
import fixes from objavi2.1 branch for non-ascii tables of contents

Possibly broken -- there have been too many changes for a simple
patch to work

esetera/Objavi,esetera/Objavi,esetera/Objavi,esetera/Objavi