Update test
Merge remote-tracking branch 'origin/master' into XSahn

Conflicts:
	test