Merge "It's API 29 time!"