merger "pie-dev" into Gingerbread