lint: Lint test fixes
test: Fixup usage of PEAR libs in testing
Merge branch 'develop' into develop-next

Conflicts:
	include/class.mailparse.php