Merge branch 'master' of github.com:c2is/Bigfoot

Conflicts:
	.build.yml
Merge branch 'master' of github.com:c2is/Bigfoot

Conflicts:
	.build.yml