Merge branch '1.4.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Fri, 22 Aug 2014 19:40:47 +0000 (15:40 -0400)
committerMorgan Deters <mdeters@cs.nyu.edu>
Fri, 22 Aug 2014 19:40:47 +0000 (15:40 -0400)

Trivial merge