Removing references to archive.sh [ci skip]
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of github.com:piwik/piwik
Fix another typo..