Merging master changelog