Merge remote-tracking branch 'dechamps/sptpsabort' into 1.1