Upgrade hoek. Closes #2123
merge