Workaround for dynamic `self` access
Merge branch 'master' into scala-2.11