Merge branch 'master' into pep8

Conflicts:
	addons/website_event/controllers/main.py
Merge branch 'plus-alfa' into cleaned-alfa