Nicolas Goaziou Merge branch 'bugfix'