Merge pull request #6909 from andrethomas/patch-2

rename-firmware.py: Bugfix