Sync from fb7cb92
Sync from 400cd85
Updated Configuration Guide (markdown)
Updated configuration (markdown)