From e26ef5e4096a4b61d92520dcdc0fe2e1794e4999 Mon Sep 17 00:00:00 2001
From: beder <jbeder@gmail.com>
Date: Thu, 8 Nov 2012 18:34:09 -0600
Subject: [PATCH] Merge from core + revert