2.8.0rc1 prep
pulled in 2.8 fork changes but reverted version files