Merge branch '1.4.x' while ignoring commit 8d5eb49.
authorKshitij Bansal <kshitij@cs.nyu.edu>
Wed, 17 Sep 2014 17:40:15 +0000 (13:40 -0400)
committerKshitij Bansal <kshitij@cs.nyu.edu>
Wed, 17 Sep 2014 17:40:15 +0000 (13:40 -0400)

Trivial merge