Merge pull request #3403 from ntherning/fix-handler-block-trampoline-crash-on-win64