Don't draw NUL chars
Merge branch 'nul_char_bis' into 2.0_dev