Merge Tony's uservars (bug #2882)