Add challenge password
Merge branch 'master' into stb

Conflicts:
	src/vm_api.c