Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	src/core/lombok/eclipse/handlers/HandleBuilder.java
#	src/core/lombok/eclipse/handlers/HandleConstructor.java
#	src/core/lombok/javac/handlers/HandleBuilder.java
#	src/core/lombok/javac/handlers/HandleConstructor.java

1 files changed, 9 insertions, 0 deletions

diff --git a/test/transform/resource/after-ecj/GeneratedOffLombokOn.java b/test/transform/resource/after-ecj/GeneratedOffLombokOn.java
new file mode 100644
index 00000000..4d215593
--- /dev/null
+++ b/test/transform/resource/after-ecj/GeneratedOffLombokOn.java
@@ -0,0 +1,9 @@
+class GeneratedOffLombokOn {
+  @lombok.Getter int x;
+  GeneratedOffLombokOn() {
+    super();
+  }
+  public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() {
+    return this.x;
+  }
+}