Merge "Gingerbread support-ish" into gb-ub-photos-bryce