supersedes !2234 (closed).
Fixes all author name related issues. Also squashed the two commits into 1.