Import of 3.6rc2-build1 tag
Changelog update for rc2 version