Merge branch 'master' into concrete5_issues

Conflicts:
	feed.php
	inc/cache.php
Merge branch 'concrete5_issues'