Correct coding conventions
Correct content errors
Merge branch 'maintenance'