Merge pull request #3458 from janh/vnstat2