Merge branch 'master' of git://github.com/openlibrary/bookreader into thumbnail_feature