Merged in v1.60