merge from master

just change log for now