This update brings the code into sync with a recent server update.