gundo did *not* like being lazy loaded
Merge branch 'master' into ubuntu