Merge branch 'master' into include_melt_transport

Conflicts:
	source/simulator/assembly.cc