Fix bustage (@dstillman should make sure that there's nothing else screwed up from the merge)
Fix bustage (@dstillman should make sure that there's nothing else screwed up from the merge)

rmzelle/zotero,robamler/zotero,hoehnp/zotero,retorquere/zotero,hoehnp/zotero,hoehnp/zotero,adunning/zotero,adunning/zotero,retorquere/zotero,gracile-fr/zotero,rmzelle/zotero,rmzelle/zotero,sendecomp/zotero,egh/zotero,gracile-fr/zotero,fbennett/zotero,LinuxMercedes/zotero,sendecomp/zotero,LinuxMercedes/zotero,LinuxMercedes/zotero,egh/zotero,robamler/zotero,robamler/zotero,aurimasv/zotero,egh/zotero,retorquere/zotero,adunning/zotero,sendecomp/zotero,gracile-fr/zotero