! Did I mention how much I love consistency?

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

! Did I mention how much I love consistency?