Push to 0.6.8-dev