Update dev with release branch changes

Updates the dev to keep the master at +0/-N during development and to reflect changelog updates and minor release changes.