patch from jbe
34 files changed