Silent clang -Wconversion warnings
Merge branch '0.20.x'