Merge branch 'gingerbread' into gingerbread-release
tree: 68b7033bf0bf32dc63da129da7dbcaf7c7bdf001
  1. core/
  2. services/