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

Upstream version 3.1.4
New upstream release