Merge branch 'master' of https://github.com/cbhaley/calibre
change poche for wallabag
Merge branch 'rename-poche-to-wallabag' of https://github.com/nicosomb/calibre
...
FB2 Output: Fix generation of FB2 sections based on a multi-level Table of Contents in the input document. Fixes #1393514 [Incorrect nesting of sections in FB2 output](https://bugs.launchpad.net/calibre/+bug/1393514)
Make the text on the selection buttons in the get books dialog more clear
Fix deleting a book from both the library and the device causing the next selected book to be incorrect, when the library is sorted by the On Device column. Fixes #1404629 [Deleting a book both in device and library makes cursor jump](https://bugs.launchpad.net/calibre/+bug/1404629)
Metadata download: Fix metadata download not working for titles that contain a apostrophes in languages other than English. Fixes #1403677 [Search metadata fails](https://bugs.launchpad.net/calibre/+bug/1403677)