Unset the correct HOOK.
Merge tag '0.15.1' into develop