Merge branch '1.3.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Fri, 21 Feb 2014 20:08:01 +0000 (15:08 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Fri, 21 Feb 2014 20:08:01 +0000 (15:08 -0500)

Trivial merge