CHANGELOG catch-up
change VERSION in master to 3.1.0.pre