Synched with upstreams.
Use eclipse 3.8.2 instead of temporary snapshot.