Merge remote-tracking branch 'origin' into platform/juno
Merge branch 'platform/juno' of github.com:scala-ide/scala-ide into platform/juno