Merge r70664-70666 to release. Improves INI parser and brings improvement to docs. Docs should now at least no longer contain completely incorrect examples.