Merge "changelog" into gingerbread