Readying 2.8a release
Merge branch 'dev' into ms