Merge branch '1.3.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Tue, 24 Dec 2013 15:57:28 +0000 (10:57 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Tue, 24 Dec 2013 15:57:28 +0000 (10:57 -0500)

Trivial merge