Merge pull request #2866 from darwinel/develop

Style guide