Improving statistic extraction to be more robust
Merge branch 'master' of https://github.com/infiniteautomation/ma-modules-public.git