Merge remote-tracking branch 'upstream/master' into develop

lib/python/qmk/c_parse.py

@@ -74,7 +74,6 @@ def find_layouts(file):
                     key['matrix'] = matrix_locations[key['label']]
 
             parsed_layouts[macro_name] = {
-                'key_count': len(parsed_layout),
                 'layout': parsed_layout,
                 'filename': str(file),
             }