All updates.
Merge branch 'master' into HEAD

Conflicts:
	Marvin.py
Merge branch 'new_branch_name'