Merged in v1.60 to get updates to manual on trunk