Merged bug fix from release candidate.