Merge master into cesium.agi.com branch.