calibre: upgrade from 1.20.0 to 1.21.0
Merge pull request #1622 from urv/master

calibre: upgrade from 1.20.0 to 1.21.0