Align with 0.9.6-stable CHANGES file, and make some corrections.