ePub: no empty paragraph before & after cover image
Merge branch 'master' into android-1.5