Merge branch 'master' into opensim

Conflicts:
	src/mapapi.tileSource.js