Merge "Updated Changelog" into gingerbread