cookies
Merge remote-tracking branch 'origin/master'

Conflicts:
	crunchy-xml-decoder/altfuncs.py