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

diff --git a/test/transform/resource/before/BuilderSimple.java b/test/transform/resource/before/BuilderSimple.java
new file mode 100644
index 00000000..c749bb6c
--- /dev/null
+++ b/test/transform/resource/before/BuilderSimple.java
@@ -0,0 +1,9 @@
+import java.util.List;
+
+@lombok.experimental.Builder
+class BuilderSimple<T> {
+	private final int noshow = 0;
+	private final int yes;
+	private List<T> also;
+	private int $butNotMe;
+}