merge master
merge master

retorquere/zotero-better-bibtex,retorquere/zotero-better-bibtex,retorquere/zotero-better-bibtex,retorquere/zotero-better-bibtex,retorquere/zotero-better-bibtex,retorquere/zotero-better-bibtex