Catch the "hooks" branch up with "develop" with a big ol' merge

Catch the "hooks" branch up with "develop" with a big ol' merge #2363