Merge remote-tracking branch 'google/release-0_13' into merge-and-regen

Conflicts:
	build.yaml
	src/ruby/lib/grpc/version.rb
diff --git a/src/ruby/lib/grpc/version.rb b/src/ruby/lib/grpc/version.rb
index 9cbd36a..ef08761 100644
--- a/src/ruby/lib/grpc/version.rb
+++ b/src/ruby/lib/grpc/version.rb
@@ -29,5 +29,5 @@
 
 # GRPC contains the General RPC module.
 module GRPC
-  VERSION = '0.14.0-dev'
+  VERSION = '0.14.0.dev'
 end