Whoops.
Merge branch 'master' into fix-warnings