Cleanup whitespace
Merge branch '2-2-stable'