Merge branch '1.4.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Fri, 3 Oct 2014 15:18:41 +0000 (11:18 -0400)
committerMorgan Deters <mdeters@cs.nyu.edu>
Fri, 3 Oct 2014 15:18:41 +0000 (11:18 -0400)

Trivial merge