OCD - formatting cleanup
Merge remote-tracking branch 'upstream/master'
minor function change