Merge "Enable building with Tycho" into idea133
automerge: 4648148

* commit '4648148c1e87bac9aa326ba942bc065e0731733b':
  Enable building with Tycho