Merge master into MapBibtexWorktypes