Allow private_token nil
Merge branch 'private_token'