Merge remote-tracking branch 'origin/master' into master-tycho
Activate required bundles if possible
Merge pull request #169 from nilshartmann/master

Activate required (DS-)bundles if needed