Merge branch 'licence' into merge
Merge branch 'improvments' into merge

Conflicts:
	recipes/default.rb