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