Merge "Updated internal plugin + eclipse dependencies."