Configuration and Logging (Apache Commons)
Merge remote-tracking branch 'origin/master'