updating jon-freed/zotero branch 4.0 with changes in upstream zotero/zotero branch 4.0