Merge branch 'master' into requestTile

Conflicts:
	src/mapapi.tileSource.js