Merge "API: Work around PHP bug 45959"