merge repositories
Merge remote-tracking branch 'nils/master'