Merge pull request #1211 from totten/master-userid-regr