Add gitignore
Imported Upstream version 1.8
Merge tag 'upstream/1.8'

Upstream version 1.8
refresh patches