1.8-dev is now merged into master--update for testnet