log4j-over-slf4j, not slf4j-log4j12
Merge branch 'master' into dao-refactor