Merge origin/master

Conflicts:
	src/util.temp/TO-DO