Generate random token directly
Merge pull request #1382 from mking/use-urandom-directly

Generate random token directly
Merge remote-tracking branch 'upstream/master'