82e3ab3977
Merge cleanup codings style commit as i accidentally used that branch as the base.
Merge cleanup codings style commit as i accidentally used that branch as the base.