Signed-off-by: Le.NoX <le.nox free.fr>
Merge branch 'master' into GFrun