Merge branch 'master' into manual-outcome
tests passing