Finish release-3
Merge branch 'master'