Fix --fetch protobuf

Closes #717

Review 519 by @mlucy
Merge branch 'next' into sam_no_aiosupport