Merge "Eclipse build updates"