Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore

Signed-off-by: Giancarlo PALUMBO <giancarlo.palumbo@free.fr>