Merge branch 'mjd3'
can't add self as friend
oops, typo
cosmetic fix
Merge remote-tracking branch 'origin/master' into mjd3