Another merge (github fail)

Learning how sometime Github client can have a bad behavior