take the best of 0.9.x and master and make 0.9.13