Merge origin/master

Conflicts:
	TODO.txt
Merge origin/master