Code style fixes
 # [#29261] Admin template "super-patch". Thanks Michael
Merge remote-tracking branch 'upstream/master'