Merge branch 'master' into subtestbranch

Conflicts:
	test.c
fas
Merge branch 'neuerbranch2'