Merge origin/master

Conflicts:
	slf4j-jdk18/src/main/java/org/slf4j/Logger.java
Merge origin/master