Merge branch 'master' into JENKINS-18048

Conflicts:
	core/src/main/java/hudson/triggers/SCMTrigger.java