Alexandre Alapetite cb114a341b Merge some pull requests from upstream 11 anni fa
..
HTML cb114a341b Merge some pull requests from upstream 11 anni fa