Merge branch '1.3.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Fri, 13 Dec 2013 22:12:37 +0000 (17:12 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Fri, 13 Dec 2013 22:12:37 +0000 (17:12 -0500)

Trivial merge