Ex-ter-minate
Merge branch 'fix1301' into 2.4