Merge remote-tracking branch 'origin/master'

Conflicts:
	sascha-test.php