Merge branch '1.3.x'
authorKshitij Bansal <kshitij@cs.nyu.edu>
Sat, 7 Dec 2013 08:30:18 +0000 (03:30 -0500)
committerKshitij Bansal <kshitij@cs.nyu.edu>
Sat, 7 Dec 2013 08:30:18 +0000 (03:30 -0500)

Trivial merge