From 7e2c5815da2f3df9bdcf81a2b1eb76e22f4acc87 Mon Sep 17 00:00:00 2001
From: The Dax <daxtsu@gmail.com>
Date: Sun, 7 Jul 2013 16:20:25 -0400
Subject: [PATCH] Rebase to latest master.