Cleanup
Merge branch 'stable' into nginx-panel

Conflicts:
	CHANGELOG