scala/scala — pull request #1258 by dragos (2012-09-05 08:51:55+00:00)
Title: Backport/instrumenter fixes part 2

Backport a second batch of instrumenter fixes from Martin (pull #1219).

review by @lrytz.