API change of UILayout.template_list, fixed.
Merge branch 'master' into prerelease (used amend in master branch)