Merge branch 'gingerbread'