Include patch proposed by Georg Hoesch to reduce memory consumption (0.19_02)