From b8f3e6a283aafefbc88ca2a60848a5182c9e9108 Mon Sep 17 00:00:00 2001
From: Elyrith <elyrith@gmail.com>
Date: Sat, 5 Oct 2013 23:39:52 -0400
Subject: [PATCH] Merge branches 'master' and '0.9'