Synced to image_ops HEAD (working, woo)