Merge 2.10.x into master

Conflicts:
	src/compiler/scala/tools/nsc/typechecker/Implicits.scala
	src/reflect/scala/reflect/runtime/JavaMirrors.scala

1 files changed, 8 insertions, 0 deletions

diff --git a/test/files/pos/t7486.scala b/test/files/pos/t7486.scala
new file mode 100644
index 0000000000..6dd7f4c4ac
--- /dev/null
+++ b/test/files/pos/t7486.scala
@@ -0,0 +1,8 @@
+object Test{
+  var locker = 0
+  // remove implicit, or change to `locker = locker + 1` to make it compile.
+  implicit val davyJones0 = {
+    locker += 0
+    0
+  }
+}