New upstream version 1.31
Merge tag 'upstream/1.31'

Upstream 1.31
Added better support for Ubuntu