Minor doc updates.
v2.9.9 release.
Merge remote-tracking branch 'mpmaster/master'