Merge branch "pie" into gingerbread