Merge branch 'kf/post-receive-sample-hook' into maint