Check for col not undefined to avoid error in forEach loop
Merge master into Custom

Conflicts:
	src/classes/eventProvider.js