Comment 7 for bug 1175711

Merged to master and backported to 2.9 and 2.8. Many thanks to Steven for the fix, to Bill for creating a branch in the working repository, to Josh for the testing and signoff and to Shae for providing steps to make it easier for non-booking libraries to test!