Merge branch 'master' into eclipse-javadoc

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

1 files changed, 17 insertions, 0 deletions

diff --git a/test/transform/resource/after-ecj/DelegateWithVarargs2.java b/test/transform/resource/after-ecj/DelegateWithVarargs2.java
new file mode 100644
index 00000000..ed0cddf5
--- /dev/null
+++ b/test/transform/resource/after-ecj/DelegateWithVarargs2.java
@@ -0,0 +1,17 @@
+import lombok.experimental.Delegate;
+class DelegateWithVarargs2 {
+  public class B {
+    public B() {
+      super();
+    }
+    public void varargs(Object[]... keys) {
+    }
+  }
+  private @Delegate DelegateWithVarargs2.B bar;
+  DelegateWithVarargs2() {
+    super();
+  }
+  public @java.lang.SuppressWarnings("all") void varargs(final java.lang.Object[]... keys) {
+    this.bar.varargs(keys);
+  }
+}