prospective 3.0.0 commits

merge these to master prior to releasing 3.0.0