Merge branch 'external-call' of gitlab.tiker.net:mattwala/grudge into external-call-2