Merge branch 'bug70'

Conflicts:
	slf4j-api/src/test/java/org/slf4j/helpers/MessageFormatterPerfTest.java