Scala 2.10 periodic merge

just a trivial
```
git pull -s recursive -X theirs upstream master
```
with a tiny patch to compile.