Merge with master to pick up commit hook works.