Merge "It's API 30 time!"