Merge branch 'master' into multi-processing

Conflicts:
	tests/state-dump/00-basic.t
	tests/state-dump/01-restart-file
	tests/state-dump/01-restart-file.t
	tests/state-dump/01-restart-file/reference.log.restart
	tests/state-dump/01-restart-file/reference.log.run