Merge branch 'next2' into gd

Conflicts:
	scripts/demo7.nut