Squashed commit of the following:

commit 471eb7361afdf812c40774dbf896e6f5c93cc6c7
Author: vagrant <vagrant@precise64.(none)>
Date:   Thu Nov 14 06:38:31 2013 +0000

    b