Merge branch 'master' of github.com:qos-ch/slf4j