Merge "Remove "@author Umherirrender" annotations"