merge stable into master

Changement de la #173