From 126f8732c1ed699e17ee5480486db3920c47284b Mon Sep 17 00:00:00 2001
From: Leah Woods <info@minifree.org>
Date: Mon, 09 May 2016 10:34:13 -0400
Subject: backport changes from master branch

---
(limited to 'docs/future/dumps/x')

--
cgit v0.9.1