Merge branch 'master' into eclipse-javadoc

Conflicts:
	src/core/lombok/javac/handlers/JavacHandlerUtil.java
	test/core/src/lombok/RunTestsViaEcj.java

1 files changed, 9 insertions, 0 deletions

diff --git a/test/transform/resource/before/DelegateWithVarargs2.java b/test/transform/resource/before/DelegateWithVarargs2.java
new file mode 100644
index 00000000..8a3dbf14
--- /dev/null
+++ b/test/transform/resource/before/DelegateWithVarargs2.java
@@ -0,0 +1,9 @@
+import lombok.experimental.Delegate;
+
+class DelegateWithVarargs2 {
+	@Delegate private DelegateWithVarargs2.B bar;
+
+	public class B {
+		public void varargs(Object[]... keys) {}
+	}
+}