Another attempt at fixing for zotero@zotero/a417c9ef59071950bf371a2f72221bab3b771f98
Merge branch 'master' into js-ctypes