merge with master, primarily for adrian's maximise-mixer change