change back to 0.6 master