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