Merge branch 'master' into feature/java5

author Andy Clement <aclement@pivotal.io>

Wed, 12 Aug 2020 22:20:29 +0000 (15:20 -0700)

committer GitHub <noreply@github.com>

Wed, 12 Aug 2020 22:20:29 +0000 (15:20 -0700)
author Andy Clement <aclement@pivotal.io>
Wed, 12 Aug 2020 22:20:29 +0000 (15:20 -0700)
committer GitHub <noreply@github.com>
Wed, 12 Aug 2020 22:20:29 +0000 (15:20 -0700)
diff --cc org.aspectj.matcher/src/main/java/org/aspectj/weaver/AbstractReferenceTypeDelegate.java
Simple merge
author	Andy Clement <aclement@pivotal.io>
	Wed, 12 Aug 2020 22:20:29 +0000 (15:20 -0700)
committer	GitHub <noreply@github.com>
	Wed, 12 Aug 2020 22:20:29 +0000 (15:20 -0700)