add missing ";" in C code
merge 0.20.x branch into master