Merge remote-tracking branch 'upstream/master' into sets
authorKshitij Bansal <kshitij@cs.nyu.edu>
Mon, 28 Apr 2014 23:11:59 +0000 (19:11 -0400)
committerKshitij Bansal <kshitij@cs.nyu.edu>
Mon, 28 Apr 2014 23:11:59 +0000 (19:11 -0400)

Trivial merge