Merge branch '1.4.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Fri, 26 Sep 2014 12:30:40 +0000 (08:30 -0400)
committerMorgan Deters <mdeters@cs.nyu.edu>
Fri, 26 Sep 2014 12:30:40 +0000 (08:30 -0400)

Trivial merge