settings.REORDER defaulted to False
Merge branch 'master' into profiling