MERGE plugin rrd from master
correction of string unicode error