Merge branch 'master' into talks

source/_layouts/talk.html.twig

@@ -0,0 +1,22 @@
+{% extends 'default.html.twig' %}
+
+{% block content_wrapper %}
+    <main class="col-md-9">
+        <h1>{{ page.title }}</h1>
+
+        <p>
+            At {{ page.event.name }} -
+            {% spaceless %}{% if page.fuzzy_date %}
+                {{ page.date|date(site.fuzzy_date_format) }}
+            {% else %}
+                {{ page.date|date(site.default_date_format) }}
+            {% endif %}{% endspaceless %}.
+        </p>
+
+        {{ page.blocks.content|raw }}
+
+        {% if page.slides.embed %}
+            {{ page.slides.embed|raw }}
+        {% endif %}
+    </main>
+{% endblock content_wrapper %}