req #3
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/components/modyametrika/connector.php