Merge pull request #595 from derrabus/2.8

Typos, missing htmlspecialchars().