Add comment, author and email.
Merge commit '17cd6aeba83524c6cbad8fd5ec5a373d663774d7'