passion: Cleanup
Merge remote-tracking branch 'origin/gingerbread' into gingerbread