WIP
WIP
Added libconfig to the repo
Merge remote-tracking branch 'upstream/master' into test
Merge branch 'master' into test