Added separator parameter to random.token.
Merge remote-tracking branch 'origin/master'