Merged remote branch 'paolo-caroni/master' into 'master'.

Signed-off-by: bert <bert.timmerman@xs4all.nl>