Fixes #596
Merge remote-tracking branch 'upstream/master'
Remove single comment end tag
Restore piwik javascript tracker
Merge pull request #617 from emmanuel-keller/master

Fixes #596