s/3.6.0/3.6 where appropriate.