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

diff --git a/test/transform/resource/after-delombok/BuilderComplex.java b/test/transform/resource/after-delombok/BuilderComplex.java
new file mode 100644
index 00000000..3c97f92a
--- /dev/null
+++ b/test/transform/resource/after-delombok/BuilderComplex.java
@@ -0,0 +1,48 @@
+import java.util.List;
+class BuilderComplex {
+	private static <T extends Number> void testVoidWithGenerics(T number, int arg2, String arg3, BuilderComplex selfRef) {
+	}
+	@java.lang.SuppressWarnings("all")
+	public static class VoidBuilder<T extends Number> {
+		private T number;
+		private int arg2;
+		private String arg3;
+		private BuilderComplex selfRef;
+		@java.lang.SuppressWarnings("all")
+		VoidBuilder() {
+		}
+		@java.lang.SuppressWarnings("all")
+		public VoidBuilder<T> number(final T number) {
+			this.number = number;
+			return this;
+		}
+		@java.lang.SuppressWarnings("all")
+		public VoidBuilder<T> arg2(final int arg2) {
+			this.arg2 = arg2;
+			return this;
+		}
+		@java.lang.SuppressWarnings("all")
+		public VoidBuilder<T> arg3(final String arg3) {
+			this.arg3 = arg3;
+			return this;
+		}
+		@java.lang.SuppressWarnings("all")
+		public VoidBuilder<T> selfRef(final BuilderComplex selfRef) {
+			this.selfRef = selfRef;
+			return this;
+		}
+		@java.lang.SuppressWarnings("all")
+		public void execute() {
+			BuilderComplex.<T>testVoidWithGenerics(number, arg2, arg3, selfRef);
+		}
+		@java.lang.Override
+		@java.lang.SuppressWarnings("all")
+		public java.lang.String toString() {
+			return "BuilderComplex.VoidBuilder(number=" + this.number + ", arg2=" + this.arg2 + ", arg3=" + this.arg3 + ", selfRef=" + this.selfRef + ")";
+		}
+	}
+	@java.lang.SuppressWarnings("all")
+	public static <T extends Number> VoidBuilder<T> builder() {
+		return new VoidBuilder<T>();
+	}
+}
\ No newline at end of file