Shortened name display to first name + last initial, to avoid long last names going off the edge of the screen.
Merge remote-tracking branch 'origin/master'