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

Resolved Conflicts:
    keyboards/kc60/rules.mk
    keyboards/xd96/rules.mk
    lib/python/qmk/cli/__init__.py

lib/python/qmk/cli/__init__.py

@@ -9,6 +9,7 @@ from milc import cli
 from . import c2json
 from . import cformat
 from . import chibios
+from . import clean
 from . import compile
 from . import config
 from . import docs
@@ -19,6 +20,7 @@ from . import hello
 from . import info
 from . import json
 from . import json2c
+from . import lint
 from . import list
 from . import kle2json
 from . import new