Aye - works fine once merged with 0.6.x.