Merge "Update tycho version"