Merge branch 'dev' into examples

Conflicts:
	prepare-workspace.sh
	project/ProjectCookbook.scala