Added Hstry as a user
Merge with upstream.
Merge pull request #1535 from YoranBrondsema/master

Added Hstry as a user