adapt to 0xFF CI
Merge branch 'master' into funke

Conflicts:
	index.html