Merge remote-tracking branch 'origin/master' into wmsImprovements

Conflicts:
	Source/Scene/WebMapServiceImageryProvider.js
Remove unnecessary code.
Merge remote-tracking branch 'origin/wmsImprovements' into nm-refactor

Conflicts:
	Source/Scene/WebMapServiceImageryProvider.js