! Un-break the upgrade... (fixes #926)

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #927 from Oldiesmann/release-2.1

! Un-break the upgrade... (fixes #926)