Prevent NPE in UserImpl#getName, refs #919
Merge branch '0.90' into 0.91