mark for 3.9
Merge remote branch 'origin/3.9'

Conflicts:
	store-locator-le.php