LOGBACK-844
LOGBACK-844 (reviewed)
Merge branch 'master' of https://github.com/qos-ch/logback

Conflicts:
	logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java