Lock on to rc3 of 0.5.4 as 0.5.4 needs a bit of work to move to