Merge "Use user name for $6 of message 'revision-info'"