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, 9 deletions

diff --git a/test/transform/resource/after-ecj/GetterLazyNative.java b/test/transform/resource/after-ecj/GetterLazyNative.java
index 1bcc3206..40fe1c84 100644
--- a/test/transform/resource/after-ecj/GetterLazyNative.java
+++ b/test/transform/resource/after-ecj/GetterLazyNative.java
@@ -11,7 +11,7 @@ class GetterLazyNative {
   GetterLazyNative() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isBooleanField() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isBooleanField() {
     java.lang.Object value = this.booleanField.get();
     if ((value == null))
         {
@@ -28,7 +28,7 @@ class GetterLazyNative {
         }
     return (java.lang.Boolean) value;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated byte getByteField() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") byte getByteField() {
     java.lang.Object value = this.byteField.get();
     if ((value == null))
         {
@@ -45,7 +45,7 @@ class GetterLazyNative {
         }
     return (java.lang.Byte) value;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated short getShortField() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") short getShortField() {
     java.lang.Object value = this.shortField.get();
     if ((value == null))
         {
@@ -62,7 +62,7 @@ class GetterLazyNative {
         }
     return (java.lang.Short) value;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int getIntField() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getIntField() {
     java.lang.Object value = this.intField.get();
     if ((value == null))
         {
@@ -79,7 +79,7 @@ class GetterLazyNative {
         }
     return (java.lang.Integer) value;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated long getLongField() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") long getLongField() {
     java.lang.Object value = this.longField.get();
     if ((value == null))
         {
@@ -96,7 +96,7 @@ class GetterLazyNative {
         }
     return (java.lang.Long) value;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated float getFloatField() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") float getFloatField() {
     java.lang.Object value = this.floatField.get();
     if ((value == null))
         {
@@ -113,7 +113,7 @@ class GetterLazyNative {
         }
     return (java.lang.Float) value;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated double getDoubleField() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") double getDoubleField() {
     java.lang.Object value = this.doubleField.get();
     if ((value == null))
         {
@@ -130,7 +130,7 @@ class GetterLazyNative {
         }
     return (java.lang.Double) value;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated char getCharField() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") char getCharField() {
     java.lang.Object value = this.charField.get();
     if ((value == null))
         {
@@ -147,7 +147,7 @@ class GetterLazyNative {
         }
     return (java.lang.Character) value;
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated int[] getIntArrayField() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int[] getIntArrayField() {
     java.lang.Object value = this.intArrayField.get();
     if ((value == null))
         {