Imported Upstream version 3.1.4
Merge tag 'upstream/3.1.4'

Upstream version 3.1.4
Imported Upstream version 3.1.5
Merge tag 'upstream/3.1.5'

Upstream version 3.1.5
Imported Upstream version 3.1.6
Merge tag 'upstream/3.1.6'

Upstream version 3.1.6