Merge branch '2.7-maintenance'

diff --cc jinja2/compiler.py
Simple merge

diff --cc jinja2/filters.py
index 4ee4e04030237131eb1fa2725fbc9bbb9db09613,fd0db04aa41026500910347cf401fe620c556188..70bb94824faa26d0879e1ccbd1d8183ff2f81f31
--- 1/jinja2/filters.py
--- 2/jinja2/filters.py
+++ b/jinja2/filters.py
@@@ -183,10 -183,10 +183,10 @@@ def do_title(s)
      uppercase letters, all remaining characters are lowercase.
      """
      rv = []
 -    for item in re.compile(r'([-\s]+)(?u)').split(s):
 +    for item in re.compile(r'([-\s]+)(?u)').split(soft_unicode(s)):
          if not item:
              continue
-         rv.append(item[0].upper() + item[1:])
+         rv.append(item[0].upper() + item[1:].lower())
      return ''.join(rv)
  
  

diff --cc jinja2/nodes.py
Simple merge

diff --cc jinja2/runtime.py
Simple merge

diff --cc jinja2/testsuite/filters.py
index fcf47a3b9432969fd8372c49f83a8cf05a63309d,282dd2d85fd174b063bd7998dccf1ad53098b4c5..9d5c95228c96a0e6904ffdb738bc3ac59fa7c0ec
--- 1/jinja2/testsuite/filters.py
--- 2/jinja2/testsuite/filters.py
+++ b/jinja2/testsuite/filters.py
@@@ -208,15 -208,9 +208,17 @@@ class FilterTestCase(JinjaTestCase)
          assert tmpl.render() == "Foo-Bar"
          tmpl = env.from_string('''{{ "foo\tbar"|title }}''')
          assert tmpl.render() == "Foo\tBar"
+         tmpl = env.from_string('''{{ "FOO\tBAR"|title }}''')
+         assert tmpl.render() == "Foo\tBar"
  
 +        class Foo:
 +            def __str__(self):
 +                return 'foo-bar'
 +
 +        tmpl = env.from_string('''{{ data|title }}''')
 +        out = tmpl.render(data=Foo())
 +        assert out == 'Foo-Bar'
 +
      def test_truncate(self):
          tmpl = env.from_string(
              '{{ data|truncate(15, true, ">>>") }}|'