Staging ppa
Merge remote-tracking branch 'sourcegraph/master'