Merge in latest planet code