ULS to master again, pick up a fix for Wikidata

Change-Id: Ifc2e6360e9981a7ecfb4001cf8f6dc2719926d6d