Revert "merged branch Cottser/master (PR #1071)"

This reverts commit 2f5c9899a4088fce3bb6325d96232cd1978161e4, reversing
changes made to 4e7094f6a3831dc86b4963d805c4567f4076fce3.

Conflicts:
	lib/Twig/Environment.php