Slightly more careful import of foreign people
Merge remote-tracking branch 'upstream/master'