Merge branch 'master' into no-affixes

Conflicts:
	checkbox.el
	test/checkbox.el-test.el