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