Merge branch '1.3.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Wed, 11 Dec 2013 04:39:58 +0000 (23:39 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Wed, 11 Dec 2013 04:39:58 +0000 (23:39 -0500)

Trivial merge