Merge branch 'master' into config
Simple ConfigParser tests
Fix a problem with details parsing
Nicer parse error
Merge branch 'config'