Update cow a little
Merge branch 'ctf' into stable

Conflicts:
	Makefile