Merge pull request #1016 from VorpalBlade/feature/3rd-party-completion