format code
format code
format
correct log message.
Merge remote-tracking branch 'tc/master'.