Merge branch 'master' into diff-oil

Conflicts:
	cake-recipe.txt