Merge pull request #9949 from totten/master-hook-ev2