cleaning up
Merge remote-tracking branch 'andreas/master'
Bugfix: 'combine' uses incorrect label list