Relevant commits: ddb82a54, 68f5926e

Also adds AUTHORS entry that should have been part of the previous commits.