Derp, typo.
Merge branch 'master' of github.com:bolt/bolt

Conflicts:
	app/src/Bolt/TwigExtension.php