Update formatting comment
Merge origin/master