Merge branch '1.4.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Thu, 16 Oct 2014 18:00:02 +0000 (14:00 -0400)
committerMorgan Deters <mdeters@cs.nyu.edu>
Thu, 16 Oct 2014 18:00:02 +0000 (14:00 -0400)

Trivial merge