Merge pull request #2610 from totten/master-fix-api-abort