Updated CHANGELOG and version to 3.6-doped