Merge branch 'master' into cleanup_annotate

Conflicts:
	common/python/nomadcore/simple_parser.py

common/python/nomadcore/local_meta_info.py

@@ -9,6 +9,7 @@ from nomadcore import compact_sha
 import json
 import os, re
 from nomadcore.json_support import jsonCompactS, jsonCompactD, jsonIndentD
+from io import open
 """objects to handle a local InfoKinds with unique name (think self written json)"""
 
 class InfoKindEl(object):

common/python/nomadcore/simple_parser.py

@@ -739,7 +739,7 @@ class CompiledMatcher(object):
                 result['matcherName'] = 'coverageIgnore'
         result['matchFlags'] = (
             result['match'] | (result['coverageIgnore'] << 2) |
-            targetStartEnd << 5 | int(result['matcher_does_nothing']) << 6)
+            targetStartEnd << 5 | int(result['matcher_does_nothing'] and result['match']) << 6)
         return result
 
     def handleMatchTelemetry(self, parser, match, line, targetStartEnd):