Merge "merging latest master" into Wikidata