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