Merge origin/master

Conflicts:
	demo/index.html