upstream update from lepture/editor