! Consistency is a beautiful thing...

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
! Minor code layout tweak

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

! Consistency is a beautiful thing...
! count() doesn't work too well on non-array objects...

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

! count() doesn't work too well on non-array objects...
Merge pull request #1069 from Arantor/release-2.1

More images dealt with.
Merge pull request #1070 from Arantor/release-2.1

More icon finangling