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