Diagnostic tweaks
Merge branch 'master' of https://github.com/GRiker/calibre