v1.3: minor code format changes
Merge remote-tracking branch 'origin/master'