Fix #1297532 [Edit Book: Wrong indent in beautify](https://bugs.launchpad.net/calibre/+bug/1297532)
DOCX Input: Fix text from some paragraphs not being converted if the paragraph contains an inline forced page break and no formatted text or line breaks. Fixes #1296817 [Private bug](https://bugs.launchpad.net/calibre/+bug/1296817) [Private bug](https://bugs.launchpad.net/calibre/+bug/1296817)
Fix #1296816 [[F. Request]: Showing "mode" in Saved Searches](https://bugs.launchpad.net/calibre/+bug/1296816)
Increase the max allowed cover size a little, to match current publishing guidelines for covers
AZW3 Input: Handle files with garbage bytes in their table of contents. Fixes #1297713 [private](https://bugs.launchpad.net/calibre/+bug/1297713)
Diagnostic tweaks
Merge branch 'master' of https://github.com/GRiker/calibre
Fix #1298071 [[Edit book]: Crash exporting image](https://bugs.launchpad.net/calibre/+bug/1298071)
Refactor HTML syntax highlighter too keep track of tag nesting

This is needed for the eventual implementation of inline spellcheck
Start work on managing dictionaries in calibre
...
Add ISO 3166 country codes
...
Implement loading of both builtin and user installed dictionaries
...