synch from chamrousse
fix conflict