Merge branch '1.4.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Fri, 17 Oct 2014 18:50:49 +0000 (14:50 -0400)
committerMorgan Deters <mdeters@cs.nyu.edu>
Fri, 17 Oct 2014 18:50:49 +0000 (14:50 -0400)

Trivial merge