merge latest master into Wikidata branch