Should work under 0.10.x now