Merge commit '97b9b2c06a' from 2.10.x into master

Check files updated: test/files/presentation/t8085*.check

Conflicts:
	build.xml
	src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
	src/compiler/scala/tools/nsc/symtab/classfile/ICodeReader.scala

1 files changed, 9 insertions, 0 deletions

diff --git a/test/files/presentation/t8085b/src/p1/nodescala/package.scala b/test/files/presentation/t8085b/src/p1/nodescala/package.scala
new file mode 100644
index 0000000000..cc383f1bab
--- /dev/null
+++ b/test/files/presentation/t8085b/src/p1/nodescala/package.scala
@@ -0,0 +1,9 @@
+import scala.Some // <-- if you move the import *inside* the package object, then it all works fine!!
+
+package p1 {
+  package object nodescala {
+    implicit class StringOps(val f: String) {
+      def rich = 0
+    }
+  }
+}