Fixed crashes caused by user lookup by uid after a nick change
Merge remote-tracking branch 'upstream/1.5' into 1.5