Merge "do not merge - Asset update (pass #3)" into gingerbread