Merge branch 'master' into kyle
I think I finally fixed the default problem.
Cleanup.
Merge branch 'kyle'