Integrated changes from the new 2.0.2 tarball. Fixes #1