Merge "update hacking to 0.6"