Addressing issues with empty contact names

//FREEBIE
Merge remote-tracking branch 'upstream/master'