Merge branch '1.3.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Thu, 9 Jan 2014 21:48:32 +0000 (16:48 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Thu, 9 Jan 2014 21:48:32 +0000 (16:48 -0500)

Trivial merge