Final fixes for odt conversion
Merge branch 'master' of github.com:FFM/FFM