Clean up
Merge branch 'master' into grapefruit