! Stylistic consistency is nice.

Signed-off-by: Peter Spicer <sleeping@myperch.org>
! These might help make the upgrader work right...

Signed-off-by: Peter Spicer <sleeping@myperch.org>
Merge pull request #877 from Arantor/release-2.1

! Things for PM labels