Fix #1200826 [Matching a library book to device search default](https://bugs.launchpad.net/calibre/+bug/1200826) (patch taken from cbhaley)
Merge branch 'kovidgoyal/master'