From bb281649fcfdacb1abe7b053fcf056f4b5dd4a34 Mon Sep 17 00:00:00 2001
From: Andrew Rodgers <acedrew@gmail.com>
Date: Sat, 21 Jun 2014 16:10:07 +0000
Subject: [PATCH] prepare for master branch after all sorts of git shenanigans