Merge branch 'refs/heads/master' into develop
Add optional logging to a log buffer
Whitespace fixes
Merge branch 'develop'