From 29d522eb19995ea084330867d7d37bb945e9dc7a Mon Sep 17 00:00:00 2001
From: zanefisher <zanefisher@gmail.com>
Date: Mon, 22 Jul 2013 17:22:44 -0400
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'upstream/master'