vanilla install
Merge branch 'master' into vanilla

Conflicts:
	Dockerfile