Merge branch 'master' into self-signed-jwt

Author: bshaffer

setup.py

@@ -27,7 +27,7 @@
 
 setup(
     name="gapic-generator",
-    version=version,
+    version=setuptools.sic(version),
     license="Apache 2.0",
     author="Dov Shlachter",
     author_email="[email protected]",