Merge pull request #822 from ds22x/master

Add option to override the BIOS
21 jobs for master in 38 minutes and 1 second (queued for 112 minutes and 55 seconds)