Merge "new assets" into gingerbread