Merge branch '1.4.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Fri, 22 Aug 2014 21:02:31 +0000 (17:02 -0400)
committerMorgan Deters <mdeters@cs.nyu.edu>
Fri, 22 Aug 2014 21:02:31 +0000 (17:02 -0400)

Trivial merge