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, 6 insertions, 2 deletions

diff --git a/test/transform/resource/after-ecj/NonNullPlain.java b/test/transform/resource/after-ecj/NonNullPlain.java
index c9c96d0a..6e937f6a 100644
--- a/test/transform/resource/after-ecj/NonNullPlain.java
+++ b/test/transform/resource/after-ecj/NonNullPlain.java
@@ -8,7 +8,9 @@ import java.lang.annotation.*;
   public @java.beans.ConstructorProperties({"i", "s"}) @java.lang.SuppressWarnings("all") NonNullPlain(final @lombok.NonNull int i, final @lombok.NonNull String s) {
     super();
     if ((s == null))
-        throw new java.lang.NullPointerException("s");
+        {
+          throw new java.lang.NullPointerException("s");
+        }
     this.i = i;
     this.s = s;
   }
@@ -26,7 +28,9 @@ import java.lang.annotation.*;
   }
   public @java.lang.SuppressWarnings("all") void setS(final @lombok.NonNull String s) {
     if ((s == null))
-        throw new java.lang.NullPointerException("s");
+        {
+          throw new java.lang.NullPointerException("s");
+        }
     this.s = s;
   }
   public @java.lang.SuppressWarnings("all") void setO(final Object o) {