Merge "Move to hacking 0.10"