Merge remote-tracking branch 'origin/master'

# Conflicts:
#	gradle.properties

Author: oliemansm

graphql-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/graphql/boot/GraphQLServletProperties.java

@@ -36,6 +36,8 @@ public class GraphQLServletProperties {
 
     private boolean exceptionHandlersEnabled = false;
 
+    private long subscriptionTimeout = 0;
+
     public String getMapping() {
         return mapping != null ? mapping : "/graphql";
     }
@@ -95,4 +97,12 @@ public boolean isExceptionHandlersEnabled() {
     public void setExceptionHandlersEnabled(boolean exceptionHandlersEnabled) {
         this.exceptionHandlersEnabled = exceptionHandlersEnabled;
     }
+
+    public long getSubscriptionTimeout() {
+        return subscriptionTimeout;
+    }
+
+    public void setSubscriptionTimeout(long subscriptionTimeout) {
+        this.subscriptionTimeout = subscriptionTimeout;
+    }
 }

graphql-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/graphql/boot/GraphQLWebAutoConfiguration.java

@@ -260,6 +260,7 @@ public GraphQLHttpServlet graphQLHttpServlet(GraphQLInvocationInputFactory invoc
                 .with(graphQLObjectMapper)
                 .with(listeners)
                 .with(graphQLServletProperties.isAsyncModeEnabled())
+                .with(graphQLServletProperties.getSubscriptionTimeout())
                 .build();
         return GraphQLHttpServlet.with(configuration);
     }