Merge remote branch 'github/gingerbread' into gingerbread