Updated change log. Ready to merge, pending outside testing.