Comment 4 for bug 1277556

Thanks for the patch Blake, and the testing Remington. I've pushed this fix to master, rel_2_6, and rel_2_5. (with one minor change to alter Blake's signoff and authorship to include his full name)