Merge branch 'testing' into kalimotxo (keep kalimotxo settings)
Conflicts: Makefile images/DEVICES targets.mk
Merge branch 'testing' into kalimotxo (keep kalimotxo settings)
Conflicts:
Makefile
images/DEVICES
targets.mk