Merge branch '1.3.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Fri, 13 Dec 2013 23:25:48 +0000 (18:25 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Fri, 13 Dec 2013 23:25:48 +0000 (18:25 -0500)

Trivial merge