Merge pull request #2112 from rubenk/battery-plugin-nul-terminate-buffer