Merge branch '1.3.x'
authorKshitij Bansal <kshitij@cs.nyu.edu>
Fri, 17 Jan 2014 14:12:25 +0000 (09:12 -0500)
committerKshitij Bansal <kshitij@cs.nyu.edu>
Fri, 17 Jan 2014 14:12:25 +0000 (09:12 -0500)

Trivial merge