Merge with Cesium 1.4