CHANGELOG update
Merge branch '2.02' into rpm