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