Merge "Dissuade use of author name in source"