merge bold into master

Conflicts:
	test.cfm