Merge pull request #2550 from scalamacros/2.10.x

[nomaster] unbreaks test.bc