Sync with changes in master

See scala-ide/scala-ide#812