tycho & p2 stuff
Merge pull request #17 in PARENT/parent from moe_17_tycho to master

* commit 'e81be949e1ce59603d0f21f774be1fbbccecd409':
  tycho & p2 stuff