got upstream updates (to lucasart)