Merge branch 'NZBmets-dev' into dev