updated to latest changes from master branch of cesium;