Source to Author renaming
Comment fix
Merge commit '38806c5c2e81d777766e78dab0cb2b4508495d8e' into 2.0.0RC4