Yes, its a big commit, was waiting 1.6 to do that... Sorry for your possible merge issues ;)
Seems to be djm34 work, i recognize the code style ;) Code was cleaned/indented and adapted to my fork... Only usable on the test pool until 16 december 2014!