cleanup (make warnings go away)
Merge remote-tracking branch 'origin/headless' into scala-2.11