Merge branch 'refs/heads/develop'
ignore rotated logs
Merge branch 'refs/heads/master' into develop