should work with 1.6 now :)

--HG--
branch : next