Merge pull request #2 from eclipse/develop