Initial sync

Synced with Eclipse Luna.