Brought in latest version to new branch

Don't ask me why, but the other branch completely failed to properly
merge. Thus, this.
Updated Changelog