Templates and blocks are now listed in order of their average execution time.
Merge remote-tracking branch 'origin/master'