Merge branch 'master_hesokr_r95m3'

Conflicts:
	test/hesokuri/source_test.clj