Merge branch '1.4.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Thu, 9 Oct 2014 00:19:15 +0000 (20:19 -0400)
committerMorgan Deters <mdeters@cs.nyu.edu>
Thu, 9 Oct 2014 00:19:15 +0000 (20:19 -0400)

Trivial merge