don't send user identifier up as (null)
Merge remote-tracking branch 'origin/master'