autohook tweaks
merge sorting fix patch
upstream