merge from master to dev

getting the changelog from master back to dev.