Fixes template_name paramter on ListView
Merge branch 'master' into sandbox