More fixes for #335

These are problems that showed up in 1.4.5 but somehow not in 1.4.4.4
Merge remote-tracking branch 'origin/master' into 1.4.5

Conflicts:
	zp-core/zp-extensions/user_groups.php

	modified:   zp-core/zp-extensions/user_groups.php