Merge branch 'master' of github.com:conda/conda-launch