merge 3.0.0 release into stable master