Trim expected and actual strings for #1115
Implement default INI settings for #1115
Fix docblocks