! Consistency is a good thing...

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

! Consistency is a good thing...