Runtime tweaks, readme update
Merge branch 'master' into HEAD

Conflicts:
	50-defaults.json
merged right