Merge master back onto develop

.github/PULL_REQUEST_TEMPLATE.md

@@ -10,7 +10,10 @@
 - [ ] `make pr` passes
 - [ ] Update documentation
 - [ ] Verify transformed template deploys and application functions as expected
-- [ ] Add/update example to `examples/2016-10-31`
 
+*Examples?*
+
+Please reach out in the comments, if you want to add an example. Examples will be 
+added to `sam init` through https://github.com/awslabs/aws-sam-cli-app-templates/
 
 By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

docs/cloudformation_compatibility.rst

@@ -108,6 +108,16 @@ StartingPosition         All
 BatchSize                All
 ======================== ================================== ========================
 
+MSK
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+======================== ================================== ========================
+     Property Name        Intrinsic(s) Supported            Reasons
+======================== ================================== ========================
+Stream                   All
+Topics                   All
+StartingPosition         All
+======================== ================================== ========================
+
 DynamoDB
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ======================== ================================== ========================

docs/internals/generated_resources.rst

@@ -326,6 +326,34 @@ AWS::Lambda::Permission            MyFunction\ **MyTrigger**\ Permission
 AWS::Lambda::EventSourceMapping    MyFunction\ **MyTrigger** 
 ================================== ================================
 
+MSK
+^^^^^^^
+
+Example:
+
+.. code:: yaml
+
+  MyFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      ...
+      Events:
+        MyTrigger:
+          Type: MSK
+          Properties:
+            Stream: arn:aws:kafka:us-east-1:123456789012:cluster/mycluster/6cc0432b-8618-4f44-bccc-e1fbd8fb7c4d-2
+            StartingPosition: TRIM_HORIZON
+      ...
+
+Additional generated resources:
+
+================================== ================================
+CloudFormation Resource Type       Logical ID
+================================== ================================
+AWS::Lambda::Permission            MyFunction\ **MyTrigger**\ Permission
+AWS::Lambda::EventSourceMapping    MyFunction\ **MyTrigger**
+================================== ================================
+
 SQS
 ^^^