Merge pull request #2863 from darwinel/develop

Small Style fix