Merge branch 'master' into clean_dead_outputs