Merging v1.60 into trunk to make manual updates visible on web page