Greg's commit from eclipse