Rearranged the author colors to give me something other than purple ;)
Merge branch 'master' into stash/3.x