2 new commits pushed to

<https://github.com/jmpsec/osctrl/tree/develop|develop>

by javuto

<https://github.com/jmpsec/osctrl/commit/97d046fbdaf87b132f13914b17316f44fbaa066d|97d046fb>

- Makefile job to merge develop into main

<https://github.com/jmpsec/osctrl/commit/47c36c02fddd17a8d827d76868af4935e166d55e|47c36c02>

- Merge pull request #858 from jmpsec/makefile-develop-to-main jmpsec/osctrl