Merge branch 'gingerbread-release' into saved-gingerbread-release