ePub: no empty paragraph before & after cover image
Merge branch 'master' into ice-cream-sandwich