Fix merge issue.  Fix the unfix my fix.
Fix merge issue.  Fix the unfix my fix.

brisandbeans/bookreader,niksu/bookreader,niksu/bookreader,internetarchive/bookreader,Islandora/internet_archive_bookreader,openlibrary/bookreader,internetarchive/bookreader,openlibrary/bookreader,brisandbeans/bookreader,brisandbeans/bookreader,gootdude/bookreader,yankl/bookreader,gootdude/bookreader,Islandora/internet_archive_bookreader,yankl/bookreader,brisandbeans/bookreader,Islandora/internet_archive_bookreader,niksu/bookreader,garyrh/bookreader,garyrh/bookreader,nikolas/bookreader,Islandora/internet_archive_bookreader,garyrh/bookreader,Islandora/internet_archive_bookreader,garyrh/bookreader,gootdude/bookreader,yankl/bookreader,nikolas/bookreader,gootdude/bookreader,openlibrary/bookreader,brisandbeans/bookreader,garyrh/bookreader,yankl/bookreader,yankl/bookreader,openlibrary/bookreader,niksu/bookreader,openlibrary/bookreader,niksu/bookreader