Zucker 13.1
Merge branch 'master' of github.com:janlelis/zucker

Conflicts:
	CHANGELOG