Merge 2.10.x to 2.11.x

Just one patch in play this time, but it is a backport that
can't be automatically merged forward, and its tripping our
[merge alarm](https://scala-webapps.epfl.ch/jenkins/view/2.N.x/job/scala-integrate-2.10.x-to-2.11.x/)

```
% git fetch origin

% export MB=$(git merge-base origin/2.11.x origin/2.10.x)

% git log --oneline --graph --decorate $MB..origin/2.10.x
* a908ded (origin/2.10.x) Merge pull request #3998 from retronym/backport/7756
* 0022dcc (retronym/backport/7756, origin/pr/3998, backport/7756) [backport] SI-7756 Uncripple refchecks in case bodies

% git co -b merge/2.10.x-to-2.11.x-20140925
Switched to a new branch 'merge/2.10.x-to-2.11.x-20140925'

% git merge -sours origin/2.10.x
Merge made by the 'ours' strategy.
```

Review by @gkossakowski