This closes #645 issue on GitHub. (Also moved a changelog line that was misplaced in a previous commit.)