Igno is left only with Newfile
Merge branch 'ingo'
Merge remote-tracking branch 'origin/master'