fixes issue #528
version 3.2.1
fixes #530
fixes #534
fix for #525
fixes #533
Fixes Issue #536
Merge branch 'hotfixes'

Conflicts:
	admin/health-check.php
	admin/lang/en_US.php