Merge pull request #525 from collectd/feature-better-graphite-escape