Merge remote-tracking branch 'upstream/master' into sets
authorKshitij Bansal <kshitij@cs.nyu.edu>
Wed, 18 Jun 2014 20:11:32 +0000 (16:11 -0400)
committerKshitij Bansal <kshitij@cs.nyu.edu>
Wed, 18 Jun 2014 20:11:32 +0000 (16:11 -0400)

Trivial merge