From 07bc4a0b2c6ef362b36790a2fe0f4f6e5ba159ea Mon Sep 17 00:00:00 2001
From: Jon Atkins <github@jonatkins.com>
Date: Thu, 2 May 2013 21:12:22 +0100
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'upstream/master'