Ugh
Merge remote-tracking branch 'origin/rewriting' into rewriting

Conflicts:
	test/networking/barebones_net_test.clj