Remove extraneous close-p
Merge branch 'master' into experiment

Conflicts:
	some_code.c