Merge commit 'a61b62e0f24f3b94d6f943a7d41543069f30edaf' of https://gi…

…thub.com/kovidgoyal/calibre

Merge commit 'a2ad9b29736c5ab638db5a988dcb1aabd8e908b0' of https://gi…

…thub.com/kovidgoyal/calibre

Merge commit '098c77b543260b17b5fdb181cfbb2fec72ecd6ca' of https://gi…

…thub.com/kovidgoyal/calibre

Merge commit '93a61d6440132d5df7602800bfd3ec8dd6a148f3' of https://gi…

…thub.com/kovidgoyal/calibre

Merge commit '6cb3640b29b987978fec0525908a5e3d0921bb4f' of https://gi…

…thub.com/kovidgoyal/calibre

Merge commit '8072ea11a33432a6773c967b3dfe72838f5b2515' of https://gi…

…thub.com/kovidgoyal/calibre

Merge commit 'f2be7dffef15986d08d068f0e469da66a612c26f' of https://gi…

…thub.com/kovidgoyal/calibre

Merge commit '392215085d0d27873d25257e99678ac2c6bf88ec' of https://gi…

…thub.com/kovidgoyal/calibre

Merge commit '42d9538e2cefafa8bdc6bec54ca4b5e139ef84cf' of https://gi…

…thub.com/kovidgoyal/calibre

Merge commit '42d9538e2cefafa8bdc6bec54ca4b5e139ef84cf' of https://gi…

…thub.com/kovidgoyal/calibre