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