Release v3.0
Merge remote-tracking branch 'upstream/master'