More descriptive warning when config directory is not writable
Preliminary work on support for different character encoding in source files
Merge