Merge "Switch name to username in @author tags"