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, 25 insertions, 0 deletions

diff --git a/test/transform/resource/after-ecj/BuilderChainAndFluent.java b/test/transform/resource/after-ecj/BuilderChainAndFluent.java
new file mode 100644
index 00000000..6a307105
--- /dev/null
+++ b/test/transform/resource/after-ecj/BuilderChainAndFluent.java
@@ -0,0 +1,25 @@
+@lombok.experimental.Builder(fluent = false,chain = false) class BuilderChainAndFluent {
+  public static @java.lang.SuppressWarnings("all") class BuilderChainAndFluentBuilder {
+    private int yes;
+    @java.lang.SuppressWarnings("all") BuilderChainAndFluentBuilder() {
+      super();
+    }
+    public @java.lang.SuppressWarnings("all") void setYes(final int yes) {
+      this.yes = yes;
+    }
+    public @java.lang.SuppressWarnings("all") BuilderChainAndFluent build() {
+      return new BuilderChainAndFluent(yes);
+    }
+    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+      return (("BuilderChainAndFluent.BuilderChainAndFluentBuilder(yes=" + this.yes) + ")");
+    }
+  }
+  private final int yes;
+  @java.lang.SuppressWarnings("all") BuilderChainAndFluent(final int yes) {
+    super();
+    this.yes = yes;
+  }
+  public static @java.lang.SuppressWarnings("all") BuilderChainAndFluentBuilder builder() {
+    return new BuilderChainAndFluentBuilder();
+  }
+}