Merge master
Merge pull request #428 from github/update-hooks

Merge master