Synchronize

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Import 2.10.8.
Merge tag 'upstream/v2.10.8'

* tag 'upstream/v2.10.8':
  Import 2.10.8.
Import 2.10.9.
Merge tag 'upstream/v2.10.9'

* tag 'upstream/v2.10.9':
  Import 2.10.9.
More synchronization

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>