Enhancements for portlets
Merge branch 'master' into extra-forums

Conflicts:
	docs/HISTORY.rst