Merge upstream changes#63

alexarchambault merged 2 commits intoscala-cli:masterscala-cli/bloop-core:masterfrom

alexarchambault:merge-upstreamalexarchambault/bloop:merge-upstreamCopy head branch name to clipboard