Merge branch '1.0'
allow overriding the distribution
Merge "allow overriding the distribution"
update copyright marker
change release version
Merge "update copyright marker"
Merge "change release version"
Merge branch 'master' into 1.0