Applied patch from MRI r44086.
Bumped version to 2.0.7.