(cherry picked from commit 9ba95700) Conflicts: configure.ac
Attach a file by drag & drop or click to upload
