Update for beta+135-dev
Update for 2.6+0-dev