Contributors now match real life, and are alpha-sorted.
Merge remote-tracking branch 'upstream/master'