Updating to 1.3-0.0 beta. Lots of changes