Copied from version 0.8.6d, released 04/26/05.
