...
Merge branch 'master' of github.com:kovidgoyal/calibre