Various stuff ??????
Signed-off-by: Matthieu 'Eldaryze' Chardon <matthieu@chardons.net>
Fusion conflicts resolution.
Signed-off-by: Matthieu 'Eldaryze' Chardon <matthieu@chardons.net>