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