Commit fb5185cd authored by Jeremy Soller's avatar Jeremy Soller

Merge branch 'master' into 'master'

Add optional and backwards-compatible MBR support in the bootloader

See merge request !1227
parents d5dd998b f6276291
Pipeline #6813 failed with stage
in 8 minutes and 19 seconds