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/src/stubs/com/sun/tools/javadoc/DocCommentScanner.java b/src/stubs/com/sun/tools/javadoc/DocCommentScanner.java
new file mode 100644
index 00000000..e2ea9614
--- /dev/null
+++ b/src/stubs/com/sun/tools/javadoc/DocCommentScanner.java
@@ -0,0 +1,25 @@
+/*
+ * These are stub versions of various bits of javac-internal API (for various different versions of javac). Lombok is compiled against these.
+ */
+package com.sun.tools.javadoc;
+
+import java.nio.CharBuffer;
+
+import com.sun.tools.javac.parser.Scanner;
+import com.sun.tools.javac.util.Context;
+
+public class DocCommentScanner extends Scanner {
+	protected DocCommentScanner(com.sun.tools.javadoc.DocCommentScanner.Factory fac, CharBuffer buffer) {
+		super(fac, buffer);
+	}
+	
+	protected DocCommentScanner(com.sun.tools.javadoc.DocCommentScanner.Factory fac, char[] input, int inputLength) {
+		super(fac, input, inputLength);
+	}
+	
+	public static class Factory extends Scanner.Factory {
+		protected Factory(Context context) {
+			super(context);
+		}
+	}
+}