Prevent stale ondevice info from showing during connections by emptying the device databases on disconnect. See http://www.mobileread.com/forums/showthread.php?t=249540
Don't take out the "reset_only" parameter
Merge branch 'master' of https://github.com/cbhaley/calibre