Merge branch 'master' into devin-donnelly-patch-6

_includes/tree.html

@@ -12,9 +12,9 @@
         {% assign path   = item.path %}
         {% assign title  = item.title %}
       {% else %}
-        {% assign page  = site.pages | where: "path", item | first %}
+        {% assign found_page = site.pages | where: "path", item | first %}
-        {% assign title = page.title %}
+        {% assign title = found_page.title %}
-        {% assign path  = page.url %}
+        {% assign path  = found_page.url %}
       {% endif %}
     {% endcapture %}