Squashed commit of the following:

commit 1fe5991895df93f1d6aa6d8f1df0a8eb46642eb7
Author: Varun Vijayaraghavan <varun.kvv@gmail.com>
Date:   Wed Aug 21 14:57:32 2013 -0400

    No need to merge twice.