merging changelog from master