Merge branch 'refs/heads/master' into dev
Refactoring bug fixe

Signed-off-by: Benjamin Mosnier <bm@kappuccino.org>
Merge branch 'refs/heads/dev'