Merge branch 'master' into unique-filter

diff --cc jinja2/filters.py
Simple merge

diff --cc tests/test_filters.py
index d6c5a759c5a7a21d484a7ec1a450f6e4a79d2145,54aa16b81023e3d6b9d131073a2d5eb529bdb7fb..3cf94ac3c4c9a7a9973f5e7a6ee418f704b38144
--- 1/tests/test_filters.py
--- 2/tests/test_filters.py
+++ b/tests/test_filters.py
@@@ -13,17 -14,8 +14,17 @@@ from jinja2 import Markup, Environmen
  from jinja2._compat import text_type, implements_to_string
  
  
 +@implements_to_string
 +class Magic(object):
 +    def __init__(self, value):
 +        self.value = value
 +
 +    def __str__(self):
 +        return text_type(self.value)
 +
 +
  @pytest.mark.filter
- class TestFilter():
+ class TestFilter(object):
  
      def test_filter_calling(self, env):
          rv = env.call_filter('sum', [1, 2, 3])