Merge branch '1.3.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Mon, 27 Jan 2014 23:04:10 +0000 (18:04 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Mon, 27 Jan 2014 23:04:10 +0000 (18:04 -0500)

Trivial merge