Merge commit '309ff57ba6' into wip/fresh-merge2
Merge commit 'b403234a27' into wip/fresh-merge2

Conflicts:
	src/compiler/scala/tools/nsc/matching/ParallelMatching.scala
	src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala
	src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala
	test/files/neg/t6963.check
Merge commit '09d1433064' into wip/fresh-merge2
Merge commit 'cabf626bbc' into wip/fresh-merge2
Merge commit '283924bfa5' into wip/fresh-merge2
Merge commit '01eb6f4958' into wip/fresh-merge2

Conflicts:
	src/compiler/scala/tools/nsc/typechecker/Macros.scala
Merge pull request #2019 from scalamacros/ticket/6539

SI-6539 moves @compileTimeOnly away from scala-reflect
Cleaning up after brutal merge of 2.10.x into master.

That's the best I can do. The tests pass, if someone wants
a cleaner merge it is all theirs.

For reference, the merge leading up to this commit was achieved
as follows. The lines with -s ours are where the merge commit
being merged was completely made up of backports from master.

  git merge -s ours eff78b852e  c1dd8bbaa4  && \
  git merge         7026376dcc  ccd7abe897 && \
  git merge -s ours 62681e191a    && \
  git merge         74b3e9aefe 7d80e08469 d24f341f08 c4f49759fe \
    27d73a2352 ba72ee7c6f 42c4cc7a1e d672102fd8 644eb7078a && \
  git merge -s ours 08596af059 b573c287d2   && \
  git merge         d1b6d8b20f    && \
  git merge -s ours 110b54a575 36f78dd606 309ff57ba6  && \
  git merge         06295f9682 d3886086c3 adf51eef76 b403234a27 && \
  git merge -s ours 09d1433064    && \
  git merge         9ddcc1b90e   cabf626bbc && \
  git merge -s ours 283924bfa5
Removed -Ymacro-no-expand.

Don't know where/how to fix it and it says it's a temporary
option.
SI-6666 Account for nesting in setting INCONSTRUCTOR

This flag is calcualed in Namers, and assigned to class
and module class symbols that are defined in self/super-calls,
and in early definitions.

For example, class D is INCONSTRUCTOR in each case below:

    class C extends Super({class D; ()})
    class C(a: Any) {
      def this(a: Any) = this({class D; ()})
    }
    new { val x = { class D; () } with Super(())

But, the calculation of this flag failed to account for
nesting, so it was not set in cases like:

    class C(a: Any) {
      def this(a: Any) = this({val x = {class D; ()}; x})
    }

This patch searches the enclosing context chain, rather than
just the immediate context. The search is terminated at the
first non term-owned context. In the following example, this
avoids marking `E` as INCONSTRUCTOR; only `D` should be.

    class C extends Super({class D { class E }; ()})

This closes SI-6259 and SI-6506, and fixes one problem
in the recently reopened SI-6957.
Add a test case from the comments of SI-6666.

This one lands in the new implementation restriction
which beats the VerifyError.
Broader checks for poisonous this references.

Replaces more VerifyErrors with implementation restrictions.
SI-6666 Catch VerifyErrors in the making in early defs.

As we did for self/super calls, add a backstop into
explicitouter and lambdalift to check when we try to
get an outer pointer to an under-construction instance.
SI-5313 Test clobbers on the back edge of a loop

I realized I was missing a test case for a local store early in a loop
that was unused but turned out to be a clobber of a store later in the
loop.
SI-5313 Minor code cleanup for store clobbering

Used withDefault on the localStores map to simplify the code. Added
a type alias for the (BasicBlock, Int) tuple type that was used
throughout the code to represent the location of an instruction.
Merge pull request #2052 from paulp/pr/merge-210x

Merge 2.10.x into master.
Merge pull request #2044 from phaller/issue/7029

SI-7029 - Makes sure that uncaught exceptions are propagated to the UEH ...
Merge pull request #1911 from kzys/jira-4976

SI-4976 Scaladoc: Add a source link to package objects
SI-6017 Generate Scaladoc's index links in Scala side

There is no reason to do it in JavaScript.
SI-6017 Scaladoc: Show all letters without dangling links

Use <span> instead of <a href="..."> if there is no page on the letter.