Merge pull request #3924 from TGIshib/master

Added --escape-proto-identifiers command-line option.