Merge branch '1.3.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Mon, 16 Dec 2013 19:34:44 +0000 (14:34 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Mon, 16 Dec 2013 19:34:44 +0000 (14:34 -0500)

Trivial merge