Bumped version
Merge branch '4.1'

Conflicts:
	src/mako/init.php