Merge branch 'master' into multiple-outputs