Merge branch '1.3.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Sat, 14 Dec 2013 00:12:54 +0000 (19:12 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Sat, 14 Dec 2013 00:12:54 +0000 (19:12 -0500)

Trivial merge