Hotfix: Make firmware generator and uploader python scripts Python 2 AND Python 3 compatible.
Merge remote-tracking branch 'upstream/master'