debug fixes
Merge branch 'master' of github.com:fabrikageroev/piwik