Merge branch 'master'

Conflicts:
	src/wap/server/console.d