`User` here
Merge pull request #2636 from maximal/patch-1

`User` here