Merge branch 'master' into cache-fixes

Conflicts:
	src/main/java/hudson/scm/SubversionRepositoryStatus.java