Some updates to the developer APIs. Untested.