Fixed #976: Bug - Wrong syntax for the mail quota value
Merge branch 'upstream-master' into TheCry-ticket-976

Conflicts:
	CHANGELOG