Merge "Merge branch 'Wikidata' into master."