Merge tag 'upstream/3.0.8' into stable

* tag 'upstream/3.0.8':
  Add upstream version 3.0.8