Bibauthorid 1.81 master

This superseeds #2260