fixed old issue with merge
Merge commit 'e7d3a11f042091c3ea2679b71ac93332f35119f8' into v3.2

Conflicts:
	index.html