Fix formatting issue.
Merge branch 'master' into tests