Merge pull request protocolbuffers#14 from Esri/marc9905/anno318_prot…

…obuf_update_3_11_b

Marc9905/anno318 protobuf update 3 11 b

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,9 +1,18 @@
 ---
 name: Bug report
 about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
 
 ---
 
+<!--
+
+NOTE: this form is for bug reports only. For questions or troubleshooting, please see the protobuf mailing list: https://groups.google.com/forum/#!forum/protobuf
+
+-->
+
 **What version of protobuf and what language are you using?**
 Version: master/v3.6.0/v3.5.0 etc.
 Language: C++/Java/Python/C#/Ruby/PHP/Objective-C/Javascript

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,9 +1,19 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
 
 ---
 
+<!--
+
+NOTE: this form is for feature requests (including cleanup requests) only. For questions or troubleshooting, please see the protobuf mailing list: https://groups.google.com/forum/#!forum/protobuf
+
+-->
+
+
 **What language does this apply to?**
 If it's a proto syntax change, is it for proto2 or proto3?
 If it's about generated code change, what programming language?

.gitignore

@@ -117,6 +117,7 @@ conformance/Conformance.pbobjc.h
 conformance/Conformance.pbobjc.m
 conformance/conformance_pb.js
 conformance/conformance_pb.rb
+conformance/core
 conformance/failing_tests.txt
 conformance/google/
 conformance/google-protobuf/
@@ -138,6 +139,8 @@ composer.lock
 php/tests/generated/
 php/tests/old_protoc
 php/tests/protobuf/
+php/tests/core
+php/tests/vgcore*
 php/ext/google/protobuf/.libs/
 php/ext/google/protobuf/Makefile.fragments
 php/ext/google/protobuf/Makefile.global
@@ -197,6 +200,9 @@ cmake/cmake-build-debug/
 # Visual Studio 2017
 .vs
 
+# Visual Studio Code
+/.vscode/
+
 # IntelliJ
 .idea
 *.iml