Calibre: Upgraded to 0.9.17