v20201014.1055

This is a nightly build off the tip of 'master'. It may be unstable and result in corrupted configurations or data loss. Use only for testing.

Merge pull request #2217 from McGiverGim/fix_osd_upload Fix OSD upload font