difftool reference?
Merge branch 'epub-fix'