Fixed conflicts when creating master-base-dist
Merge branch 'v3.0'