Merge branch 'master' into reorder_pre_post

Conflicts:
	src/mc/classic/worker.cc