More explicit error message in case of invalid config file
Merge branch 'cache'