Merge "changelog / repackaging"