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