Merge branch 'master' into slapos
Cédric de Saint Martin authored
87e598d9