Oops, fixed sort of the TemplateHaskell extension
Merge branch 'maint-2.4.0'