Merge branch '1.3.x'
authorKshitij Bansal <kshitij@cs.nyu.edu>
Mon, 9 Dec 2013 19:18:38 +0000 (14:18 -0500)
committerKshitij Bansal <kshitij@cs.nyu.edu>
Mon, 9 Dec 2013 19:18:38 +0000 (14:18 -0500)

Trivial merge