Updated changelog for v1.2
Merge branch 'changelog_v1.2'