Merge "Add self to credits (Ed Sanders)"