Ok, we made it work... a bit.
Merge remote-tracking branch 'origin/master'