Updated coding style.
Merge commit '664d497'