Change arguments around.
Letters were conflicting in the other branch, and I think this is a bit more
intuitive.
Merge branch 'master' into read