Merge "Revert "merged master"" into Wikidata