Comments in its own line
Merge remote-tracking branch 'upstream/master' into pr-rewrite_l10n

Conflicts:
	lib/l10n.php
	tests/lib/l10n.php
Remove tests
Fix typo
Merge branch 'pr-rewrite_l10n' into nctubox

Conflicts:
	tests/lib/l10n.php