Merge branch 'master' of https://github.com/t3d/calibre
version 1.42.0
rsync on my dev machine no longer supports -z
...
Add missing parameter to unsafe_format to prevent exceptions in save-to-disk
Respect the strip_results parameter in unsafe_format. No one uses it so there isn't any rush to incorporate this push.
Merge branch 'master' of https://github.com/cbhaley/calibre
...
...
...
Fix #1335468 [Editor: ValueError: No JSON object could be decoded](https://bugs.launchpad.net/calibre/+bug/1335468)
Fix #1332837 [Additional article words in Italian](https://bugs.launchpad.net/calibre/+bug/1332837)
Fix #1335598 [corrupted tooltip with very long tweak setting](https://bugs.launchpad.net/calibre/+bug/1335598) and pep8
Fix bulk load input plugin config if exist custom plugin. Plugin Doc
input.

Change-Id: I386d4236dc01435c81ab599895a673df871b8572
Edit Book: Fix a crash when performing some image editing operations on 64 bit calibre builds
cleanup .gitignore
Fix third party conversion plugins not working with bulk conversions

Merge branch 'master' of https://github.com/igieon/calibre
pep8
...
Metadata download: Round the downloaded ratings so that, for example, 3.6 stars becomes 4 stars instead of 3 stars. Fixes #1335696 [Amazon Ratings metadata download only rounds down](https://bugs.launchpad.net/calibre/+bug/1335696)