Merge branch '1.4.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Sat, 27 Sep 2014 16:47:19 +0000 (12:47 -0400)
committerMorgan Deters <mdeters@cs.nyu.edu>
Sat, 27 Sep 2014 16:47:19 +0000 (12:47 -0400)

Trivial merge