3.0.0
Merge branch 'v3'