formatting

alignment, new-style hash syntax
Merge branch '2-2-stable' into 2-2-dev