Merge branch 'master' into jdk8. Also added some major fixes whilst merging.

Conflicts:
	src/core/lombok/javac/handlers/JavacHandlerUtil.java
	src/utils/lombok/javac/CommentCatcher.java
	src/utils/lombok/javac/Javac.java

1 files changed, 4 insertions, 4 deletions

diff --git a/test/transform/resource/after-ecj/GetterLazyEahcToString.java b/test/transform/resource/after-ecj/GetterLazyEahcToString.java
index 1ca848af..db2d4fcf 100644
--- a/test/transform/resource/after-ecj/GetterLazyEahcToString.java
+++ b/test/transform/resource/after-ecj/GetterLazyEahcToString.java
@@ -1,11 +1,11 @@
 @lombok.EqualsAndHashCode(doNotUseGetters = true) @lombok.ToString(doNotUseGetters = true) class GetterLazyEahcToString {
-  private final @lombok.Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<String>> value = new java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<String>>();
+  private final @lombok.Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.lang.Object> value = new java.util.concurrent.atomic.AtomicReference<java.lang.Object>();
   private final @lombok.Getter String value2 = "";
   GetterLazyEahcToString() {
     super();
   }
   public @java.lang.SuppressWarnings("all") String getValue() {
-    java.util.concurrent.atomic.AtomicReference<String> value = this.value.get();
+    java.lang.Object value = this.value.get();
     if ((value == null))
         {
           synchronized (this.value)
@@ -14,12 +14,12 @@
               if ((value == null))
                   {
                     final String actualValue = "";
-                    value = new java.util.concurrent.atomic.AtomicReference<String>(actualValue);
+                    value = ((actualValue == null) ? this.value : actualValue);
                     this.value.set(value);
                   }
             }
         }
-    return value.get();
+    return (String) ((value == this.value) ? null : value);
   }
   public @java.lang.SuppressWarnings("all") String getValue2() {
     return this.value2;