CODE: Minor style changes
Merge branch '11.x' into devel-new
Merge branch 'devel-new' into passenger-generation