Merge branch gingerbread into GingerSony