Update alpha
Merge branch 'Wulter-patch-1'
Merge branch 'master' of github.com:liebreich/test

Conflicts:
	alpha