Turning on the garbage collector again. See if this breaks travis.
Merge branch '1.7' into 1.8
Merge branch '1.8'