Update .travis.yml
Update log4j.xml
Merge remote-tracking branch 'upstream/master'