Merge branch 'master' into sprint-branch

diff --cc CHANGES
index 7b204dace63c901ec2638274198adf3c9dc8de62,c2cd4a4366d3751067b253cda0b0c1e89d8a4401..95fd4823accec856e3fc3626fda218db9a36ef80
--- 1/CHANGES
--- 2/CHANGES
+++ b/CHANGES
@@@ -15,8 -15,7 +15,9 @@@ Version 2.
    want to change this encoding they can override the filter.
  - Accessing `last` on the loop context no longer causes the iterator
    to be consumed into a list.
 +- Python requirement changed: 2.6, 2.7 or >= 3.3 are required now,
 +  supported by same source code, using the "six" compatibility library.
+ - Allow `contextfunction` and other decorators to be applied to `__call__`.
  
  Version 2.6
  -----------

diff --cc jinja2/runtime.py
Simple merge

diff --cc jinja2/testsuite/regression.py
Simple merge