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

Trivial merge