Merge "Merge "Fix warning from clang+mingw" am: 7fce15dc5e am: 31bcd7acea am: e2a0c1d062"