Merge branch '1.3.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Tue, 11 Mar 2014 23:08:38 +0000 (19:08 -0400)
committerMorgan Deters <mdeters@cs.nyu.edu>
Tue, 11 Mar 2014 23:08:38 +0000 (19:08 -0400)

Trivial merge