dev/new-apis

Tracking branch for keeping up with SDL master. Merge only when SDL cuts a release.

Last synced with upstream trunk as of:

```
    f813b8b10b55 Fri, 04 Jul 2014 17:20:22 -0700
```