Merge pull request #1 from eclipse/master

Update from original