Add my name to Authors as per contrib instructions
Merge branch 'edx-master'