Refs #4990  More fixes to make installer bullet proof
Merge branch 'master' of github.com:piwik/piwik